force-use-luajit-system-lib

Gbp-Pq: Name 0004-force-use-luajit-system-lib.patch

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c0a638993154d5f4b57d3276770e254613f2c5cf..7fb4e3ccd1e3187ca57e11f67d2236d2ee42c732 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,26 +25,3 @@ endif
 if BUILD_WCCP
 SUBDIRS += wccp
 endif
-
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)"
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 406f08a90ba70e0f44047d8d3cecc6b559948e9c..3578f5953637ea2735d935f20ce459ba57e5fb44 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -305,9 +305,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -906,29 +906,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-# Some special hacks around building the luajit.
-#
-#  - Copy the luajit source tree if we're doing out-of-source builds
-#  - Upon clean, remove the luajit tree from the out-of-source build tree
-#
-# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
-#       the -m64 flag. See configure.ac.
-#
-all-local:
-       @echo "Making all in luajit"
-       test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-       cd luajit && $(MAKE) $(AM_MAKEFLAGS) \
-               BUILDMODE="static" \
-               PREFIX="$(prefix)" \
-               CC="$(CC)" \
-               CFLAGS="$(LUAJIT_CFLAGS)" \
-               XCFLAGS="" \
-               LDFLAGS="$(LUAJIT_LDFLAGS)"
-
-clean-local:
-       test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
-       test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/lib/atscppapi/Makefile.in b/lib/atscppapi/Makefile.in
index 928d797eca7e845e27f1f0d38f4185e871e3f7e7..d99c7bbd8e6ade222961885ee3f4dc87415127bd 100644 (file)
--- a/lib/atscppapi/Makefile.in
+++ b/lib/atscppapi/Makefile.in
@@ -284,9 +284,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/atscppapi/examples/Makefile.in b/lib/atscppapi/examples/Makefile.in
index 52e00f2a33f0aea295dbea523f1cbc6d1f37cbfe..21ef0dab589be400b6ed901d54b520cad430caee 100644 (file)
--- a/lib/atscppapi/examples/Makefile.in
+++ b/lib/atscppapi/examples/Makefile.in
@@ -529,9 +529,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/atscppapi/src/Makefile.in b/lib/atscppapi/src/Makefile.in
index b201b167021a66d56a82795be18dbfb20fe2ba10..066d2c4bdc3e997f54b83e6983bed8e3b4eaf6ab 100644 (file)
--- a/lib/atscppapi/src/Makefile.in
+++ b/lib/atscppapi/src/Makefile.in
@@ -350,9 +350,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index 3918c3d042f6c64b7ab0f63932c1f56881690754..a88db7b1d32ab3f8c5a1912fc3f92de7987558d5 100644 (file)
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -19,9 +19,10 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS = \
-  $(LUAJIT_CPPFLAGS) \
+  $(LUA_CPPFLAGS) \
   -I$(top_srcdir)/lib \
-  -I$(top_srcdir)/lib/records
+  -I$(top_srcdir)/lib/records \
+  $(LUA_CPPFLAGS)
 
 noinst_LTLIBRARIES = libbindings.la
 

diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in
index 290a0cda5511a504571c9393e6ed71b72df884f6..0ef9783e0c5c71cec6be77ed18039066298539d6 100644 (file)
--- a/lib/bindings/Makefile.in
+++ b/lib/bindings/Makefile.in
@@ -326,9 +326,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -608,9 +608,10 @@ Clang_Tidy_CXX_Files = $(filter %.cc, $(sort $(1)))
 CXX_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CXX_Files,$^) -- $(CXXCOMPILE) -x c++
 CC_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CC_Files,$^) -- $(COMPILE) -x c
 AM_CPPFLAGS = \
-  $(LUAJIT_CPPFLAGS) \
+  $(LUA_CPPFLAGS) \
   -I$(top_srcdir)/lib \
-  -I$(top_srcdir)/lib/records
+  -I$(top_srcdir)/lib/records \
+  $(LUA_CPPFLAGS)
 
 noinst_LTLIBRARIES = libbindings.la
 libbindings_la_SOURCES = \

diff --git a/lib/perl/Makefile.in b/lib/perl/Makefile.in
index 0fdb21a4d065858ac44cffbe40737cc9b2cad1b2..e7a370d205427d4b9e0aa3cd4a2a319e6e0d3d0a 100644 (file)
--- a/lib/perl/Makefile.in
+++ b/lib/perl/Makefile.in
@@ -242,9 +242,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/records/Makefile.in b/lib/records/Makefile.in
index e8b5282159fc66cf2e67eed6bf6d452f306af118..7a10f42e3609fdd4878d73d88d9e043d612cef65 100644 (file)
--- a/lib/records/Makefile.in
+++ b/lib/records/Makefile.in
@@ -347,9 +347,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/ts/Makefile.in b/lib/ts/Makefile.in
index 7656215c5b53d922604a0f50b69e7319a2077a87..531e409230ed72816653a6068ce726752b2656ea 100644 (file)
--- a/lib/ts/Makefile.in
+++ b/lib/ts/Makefile.in
@@ -634,9 +634,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/tsconfig/Makefile.in b/lib/tsconfig/Makefile.in
index 2ee46737085ef54ac5520498e59018b9b643c8d9..ec759baec6cb819b43aee652ba745d6f77f8c983 100644 (file)
--- a/lib/tsconfig/Makefile.in
+++ b/lib/tsconfig/Makefile.in
@@ -399,9 +399,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/lib/wccp/Makefile.in b/lib/wccp/Makefile.in
index 15828834692d01174c13c0334b6ba719f8db8eaf..a12616c9276727bbbbf801e6ddcfe204c2f8f3b6 100644 (file)
--- a/lib/wccp/Makefile.in
+++ b/lib/wccp/Makefile.in
@@ -334,9 +334,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@